merge?

diff --cc tools/python/xen/xend/XendDomainInfo.py
index 8209ef95880fb4d64563c2fb4b45eb42a66b8cbc,8817ff30eb1f1974e0d732ff4882bb38efcbb80b..7251239bad4ad448f0efb393e635b618884ff3f3
--- 1/tools/python/xen/xend/XendDomainInfo.py
--- 2/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@@ -842,9 -814,10 +808,10 @@@ class XendDomainInfo
      def create_channel(self):
          """Create the channels to the domain.
          """
 -        self.store_channel = self.eventChannelOld("store_channel")
 -        self.console_channel = self.eventChannel("console", "port")
 +        self.store_channel = self.eventChannel("store/port")
 +        self.console_channel = self.eventChannel("console/port")
  
+ 
      def create_configured_devices(self):
          devices = sxp.children(self.config, 'device')
          for d in devices:
@@@ -1123,23 -1098,19 +1092,20 @@@
  
      def dom0_init_store(self):
          if not self.store_channel:
 -            self.store_channel = self.eventChannelOld("store_channel")
 -        self.store_mfn = xc.init_store(self.store_channel.port2)
 -        if self.store_mfn >= 0:
 -            self.db.introduceDomain(self.id, self.store_mfn,
 -                                    self.store_channel)
 -        self.exportToDB(save=True, sync=True)
 -        # get run-time value of vcpus and update store
 -        self.exportVCPUSToDB(dom_get(self.id)['vcpus'])
 +            self.store_channel = self.eventChannel("store/port")
 +            if not self.store_channel:
 +                return
 +        ref = xc.init_store(self.store_channel.port2)
 +        if ref and ref >= 0:
 +            self.setStoreRef(ref)
 +            IntroduceDomain(self.id, ref, self.store_channel.port1, self.path)
 +            # get run-time value of vcpus and update store
 +            self.exportVCPUSToDB(dom_get(self.id)['vcpus'])
  
- def vm_field_ignore(vm, config, val, index):
-     """Dummy config field handler used for fields with built-in handling.
  
-     @param vm:        virtual machine
-     @param config:    vm config
-     @param val:       config field
-     @param index:     field index
+ def vm_field_ignore(_, _1, _2, _3):
+     """Dummy config field handler used for fields with built-in handling.
+     Matches the signature required by config_handlers.
      """
      pass